File path fix #23

Merged
merged 4 commits into from May 17, 2011

Conversation

Projects
None yet
3 participants
Contributor

marijn commented May 17, 2011

A proper up to date PR from a separate branch, I see you dropped git flow on this one..?

Contributor

marijn commented May 17, 2011

I'm sorry, something want wrong, give me a minute to update this...

Contributor

marijn commented May 17, 2011

This should be mergeable now.

If you have any recommendations for my rebasing skills please do tell :-)

stof commented May 17, 2011

you merge it intsead of rebasing.

Contributor

marijn commented May 17, 2011

I followed the rebase instructions from the symfony docs...

Suggestions how I could prevent the merge commit?

stof commented May 17, 2011

rebasing does not include a merge commit.

everzet closed this May 17, 2011

Owner

everzet commented May 17, 2011

@marijn it's simple - you do your job in feature branch (your file-path-fix) and when it's time - you do:

git checkout master
git pull everzet master
git checkout file-path-fix

and:

git rebase master

instead of:

git merge master

This way, git will just move your file-path-fix commits on top of commits from updated master branch instead of merging it ;-)

everzet reopened this May 17, 2011

@everzet everzet added a commit that referenced this pull request May 17, 2011

@everzet everzet Merge pull request #23 from marijn/file-path-fix
File path fix
670354e

@everzet everzet merged commit 670354e into everzet:master May 17, 2011

stof commented May 17, 2011

and of couse git push origin --force to avoid merging with the non-rebased version of the PR.

Owner

everzet commented May 17, 2011

@stof if PR is already created - yes: git push origin file-path-fix --force

Contributor

marijn commented May 17, 2011

I see, I forget to use rebase --continue after resolving conflicts. Thanks for the tip.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment