On 23 Jan 2017, at 23:41, Greg Stein wrote:
commit 1 of 50 ??
This says to me: push more often. How can the mynewt community review
your
work, if you never push it?
:-) as pointed out, it’s bringing the sensors_branch up to date: Vipul
has started working on it, and I brought it up to develop so he
wouldn’t have to learn a new code base, and all the changes in develop
simultaneously. I’ve been working on a long running branch, as I
don’t want this to make rel, but rather after-rel.
That said, I’d like to use this opportunity to ask for remedial git
lessons. :-) I have found that when I merge from develop->my_branch, I
often see merge conflicts in files I haven’t even touched. I go
through, like a good git monkey and manually resolve the conflicts, but
it makes me feel like I’m doing something wrong. As an example, this
time I had a ton of merge conflicts in OIC and CBOR: neither of which
I’d touched on my branch.
When I merge, I often do either:
$ git checkout <my-branch>
$ git fetch origin develop
$ git merge
Or
$ git checkout <my-branch>
$ git pull origin develop
Then resolve conflicts.
Is this right? What should I do when I see a whole bunch of merge
conflicts in files I haven’t touched?
Sterling
