1. Janusgraph-Dev
  2. Topics

merging commits from 0.2.0 with conflicts

Chris Hupman <chris...@...>
 

Hello,

I just threw a doc fix to 0.2.0 and went to do a merge commit when I ran into conflicts, see below:

Chriss-MacBook-Pro-2:janusgraph chupman$ git status
On branch merge-monitoring-doc-fix
You have unmerged paths.
  (fix conflicts and run "git commit")
  (use "git merge --abort" to abort the merge)

Changes to be committed:

modified:   docs/monitoring.adoc
modified:   janusgraph-test/src/test/java/org/janusgraph/blueprints/process/traversal/strategy/optimization/JanusGraphStepStrategyTest.java

Unmerged paths:
  (use "git add <file>..." to mark resolution)

both modified:   janusgraph-core/src/main/java/org/janusgraph/graphdb/tinkerpop/optimize/HasStepFolder.java
 

With 0.2.1 and 0.3.0 coming up in the near future I figure someone with write access will be doing a final merge before the releases, but I was wondering what the preferred resolution method is.

When there's a merge conflict should someone:

a) cherry-pick their commit
b) resolve the issues and submit a PR
c) ping the dev list or gitter and ask someone to resolve the conflict
d) assume someone else will merge it
e) other
Jason Plurad <plu...@...>
 

When a committer merges a fix that needs to go into 0.2 and master, they need to follow up and make sure that the fix goes into master. Ideally this happens at about the same time. It looks like one missed the upstream merge. We've noted it on that PR.


On Monday, March 26, 2018 at 6:25:08 PM UTC-4, Chris Hupman wrote:
Hello,

I just threw a doc fix to 0.2.0 and went to do a merge commit when I ran into conflicts, see below:

Chriss-MacBook-Pro-2:janusgraph chupman$ git status
On branch merge-monitoring-doc-fix
You have unmerged paths.
  (fix conflicts and run "git commit")
  (use "git merge --abort" to abort the merge)

Changes to be committed:

modified:   docs/monitoring.adoc
modified:   janusgraph-test/src/test/java/org/janusgraph/blueprints/process/traversal/strategy/optimization/JanusGraphStepStrategyTest.java

Unmerged paths:
  (use "git add <file>..." to mark resolution)

both modified:   janusgraph-core/src/main/java/org/janusgraph/graphdb/tinkerpop/optimize/HasStepFolder.java
 

With 0.2.1 and 0.3.0 coming up in the near future I figure someone with write access will be doing a final merge before the releases, but I was wondering what the preferred resolution method is.

When there's a merge conflict should someone:

a) cherry-pick their commit
b) resolve the issues and submit a PR
c) ping the dev list or gitter and ask someone to resolve the conflict
d) assume someone else will merge it
e) other

1 - 2 of 2