-
Notifications
You must be signed in to change notification settings - Fork 4
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Main and develop branches are diverging #18
Comments
Hello ! I think you are saying that I have chosen to follow the Git Flow organization :
When I print the repository graph, I do not see any problem : # git log --graph --pretty --abbrev-commit --oneline
* 11ce8f1 (HEAD -> develop, origin/develop) fix: nb-NO and pt-BR fastlane locales (#17)
* e20ee5e Fix deprecated build options (#9)
|\
| * 5b15f41 Update Changelog
| * f10ca69 Upgrade Android gradle plugin to v8.3.1
| * 11f0411 Update build options (Fixes #8)
* | a57102f Fix some FDroid-Bot Suggestions (#7)
|\|
| * c529977 Updated Changelog
| * 90abbda User the complete gradle zip
| * 224127a Fix gradle wrapper version mismatch
| * fffb189 Fixed wrong fastlane folder names
| * 0406588 Added icon.png to fastlane metadata
|/
* dd300c6 (tag: 0.0.1, origin/main, origin/HEAD, main) Release 0.0.1 (#5) User willing to contribute have to create their branch based on Was it your point ? I know I have to update Credit to https://medium.com/@yanminthwin/understanding-github-flow-and-git-flow-957bc6e12220 for the graph. |
It seems it has been a misreading on my end. From what I saw it looked like !17 was merged into main but not devel, hence my question. I wonder if it was a caching issue or something, since things look different now. 🤦 Sorry for raising an undue warning. |
From a cursory examination, it seems that the main and develop branches are diverging slightly.
This may be an issue when merging is involved, so I think it may be wise to realign the two branches while they can still be merged automatically.
The text was updated successfully, but these errors were encountered: