git stash push -m "my-stash-session"

git checkout develop

git pull

git checkout your-brach

git merge origin/develop

// I bring what I have in stash
git stash pop

// fixing conflicts

git add .
git commit -m “merging your-branch with develop.”
git push origin your-branch

// your branch is in sync with the latest changes in develop
// someone could accept your branch pull request in develop and should have no problem


Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out /  Change )

Twitter picture

You are commenting using your Twitter account. Log Out /  Change )

Facebook photo

You are commenting using your Facebook account. Log Out /  Change )

Connecting to %s