On Mon, Mar 30, 2015 at 2:49 AM, <win...@genial.ms> wrote:
> Hi,
>
> I found the problem with your merge requests on sourceforge.
> There has to be a new branch in your private repository for each request,
> preferably named to give a
> hint as to the contained changes, so the merge request can remember
> correctly which commits you
> like to have merged.
> Otherwise all merge requests get intermingled and screwed up as they are
> now when you continue
> pushing commits to the same branch.
>
>
> Regards
>
> wintertime
>
>
Hello,
So far I have not succeeded in submitting a Merge request so that only one
commits I want pushed in that change are being submitted as part of the
Merge Request.
For instance, I submitted a simple request in MR#14 to change a couple
lines of the project.xml file within the config/nbproject directory. That
went fine. That commit is [e657b6].
Then, I made another new branch (SACC_1) that should have only contained
the change for a few lines of new cleanup in the panel directory (MR #15),
but while it submitted that change, it also submitted a change for the
previous MR#14 change as well. The commit I want submitted is [163903]
alone and not [e657b6] as well.
Is there some type of admin access that I can have that will allow me to
edit the Merge Requests I make so that I can trip off excess commits from
each MR and that way when the Developer comes along to approve the change
and actually commit to the FreeCol source code, the proper changes are
submitted and not those that would try to change code that has already been
changed.
For reference, I'm using GitExtentions to produce commits (I can also use
NetBeans for this and it's the exact same result) and then GitExtensions
again to push the change to my private Fork.
Thanks in advance for any tips.
Best,
--
*Caleb R. Williams*
------------------------------------------------------------------------------
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the
conversation now. http://goparallel.sourceforge.net/
_______________________________________________
Freecol-developers mailing list
Freecol-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/freecol-developers
