search

Epihedron / Adventurer

Adventurer webpage and assests
epihedron.com
3 stars 0 forks source link

Akdesign #30

Closed 13ruce1337 closed 10 years ago

13ruce1337 commented 10 years ago

Refer here I am an idiot and closed the pull resulting in git errors

13ruce1337 commented 10 years ago

Same issue..... says

We can’t automatically merge this pull request.
zerske commented 10 years ago

Closing this out, had to re-merge origin master and akdesign origin. Will submit another pull request when everything has been merged and is up to date.

zerske commented 10 years ago

So I guess the workflow is: someone has to be responsible for resolving conflicts locally. You can save your conflict resolution file so someone else can review it, but it'll eventually come down to someone merging locally and pushing those decisions they've made during conflict resolution.