| Summary: | Android Common XML Editor should not be the default for all XML files | ||
|---|---|---|---|
| Product: | [Tools] andmore | Reporter: | Kaloyan Raev <kaloyan> |
| Component: | Core | Assignee: | David Carver <d_a_carver> |
| Status: | VERIFIED FIXED | QA Contact: | |
| Severity: | normal | ||
| Priority: | P3 | CC: | cdtdoug, d_a_carver |
| Version: | unspecified | ||
| Target Milestone: | 0.5-M2 | ||
| Hardware: | PC | ||
| OS: | Linux | ||
| See Also: | https://github.com/eclipse/andmore/pull/94 | ||
| Whiteboard: | |||
|
Description
Kaloyan Raev
GitHub Pull Request 94 created by [kaloyan-raev] https://github.com/eclipse/andmore/pull/94 Will merge this change in as soon. Sorry for the delay. Merged this into develop. Thanks for the fix, it has been a long annoying bug. Actually, it looks like this was merged to master, not develop. Just did a pull. Can anyone enlightened me why there is develop and master branches and what is the difference between them? Perhaps, it makes sense to describe this in the Contributing section of the README. (In reply to Kaloyan Raev from comment #5) > Can anyone enlightened me why there is develop and master branches and what > is the difference between them? Perhaps, it makes sense to describe this in > the Contributing section of the README. I'm following the gitflow model for development: http://nvie.com/posts/a-successful-git-branching-model/ When a milestone is released, it is merged into the "master" branch and tagged, master is what is considered to be stable code. The development branch is where the active development happens, when it is considered read to release a milestone and an official release, a release branch will be cut, built, tagged, and then once it is considered good, it'll be merged back into master. A bit more information is available on the wiki for the project. https://github.com/eclipse/andmore/wiki/Releasing-Andmore (In reply to Doug Schaefer from comment #4) > Actually, it looks like this was merged to master, not develop. Just did a > pull. Thanks Doug. I've pulled the change over into develop and pushed it to the github repo. (In reply to David Carver from comment #6) > When a milestone is released, it is merged into the "master" branch and > tagged, master is what is considered to be stable code. I supposed it was gitflow... I've always wondered what is the benefit of using master just for tags log... Nevermind, your choice... Since most of the Eclipse projects expect contributions to be done in the master branch, it should be clearly stated that Andmore expects them in the develop branch. Currently, this is not clear in the README file - the info is buried in the wiki. (In reply to David Carver from comment #8) > (In reply to Doug Schaefer from comment #4) > > Actually, it looks like this was merged to master, not develop. Just did a > > pull. > > Thanks Doug. I've pulled the change over into develop and pushed it to the > github repo. Got it. Thanks! Verified with the latest nightly build. *** Bug 465702 has been marked as a duplicate of this bug. *** |