Karina Guenther wrote:So, I've been doing some research on git rebasing as I'm the only person working on my branch and I'd like to avoid merge conflicts before the merge request finds them.
at least one of these recommends rebasing everyday.
• git rebase -i origin/develop. (NOTE: i don't fully understand what this command does... Is it pulling the newest from remote develop or just my local?)
• it will open the editor and remove all commits that are NOT yours
• #important, don’t do any git pull to merge from remote
• git push — force-with-lease (overwrite the remote even there is divergent) (NOTE: this seems dangerous)
the 2nd is from
What steps do you prefer to ensure that your branch will merge?
Karina Guenther wrote:Do you have a favorite location with clear - precise steps / commands for reference?