Hello guys,
I just did my first commits on OpenOCD (and hope that they get merged), but
I'm also new to git and the Gerrit workflow, so I think I might have not
done well.
Perhaps I should have first asked before pushing anything, so sorry about
that, I was too eager to contribute to the project.
I had to amend some of the patches, but I believe I solved these issues.
However, I created a Merge Conflict with this patch:
7d62a54ea0866e59a5bfe0f850dde0a7090deeab "flash/at91sam4: different erase
sector and lock region sizes" and I'm not sure what I should do about it.
It conflicts with the previous patch I made: they are logically different
changes, but touch the same code. Should I somehow try to make the second
patch work without the first?
Thank you for your understanding and helping me through.
Best regards,
Svetoslav Enchev
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
OpenOCD-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openocd-devel
