Re: [OpenOCD-devel] First commits, new to git.

2018-08-05 Thread Tomas Vanek via OpenOCD-devel
On 05.08.2018 13:33, Svetoslav Enchev wrote: 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

[OpenOCD-devel] First commits, new to git.

2018-08-05 Thread Svetoslav Enchev
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.