I have a Git repository with a branch that almost never changes (no one contributes to it). This is basically a master branch with code and files highlighted. Having this branch makes it easier for me to pack a more compact version of my project without having to cut code and files manually each time.
I used git rebase to get this branch updated with the wizard, but I always get this warning when I try to push the branch after reboot:
To prevent you from losing history, non-fast-forward updates were rejected Merge the remote changes before pushing again. See the 'Note about fast-forwards' section of 'git push --help' for details.
Then I use git push --force and it works, but I feel like this is probably bad practice. I want this branch to "synchronize" with the master quickly and easily. Is there a better way to handle this?
Update
See this topic for a full explanation and solution:
git rebase and git push: fast forward, why use?
m1755 source share