Skip to main content
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [jta-dev] Syncing master with the commits from EE4J (may require force push)
Hi Tom

What's the delta between EE4J_8 and master? Is there anything in master we'd potentially want to keep that might get overwritten with a force push?

In general, I tend to avoid force-pushing - if anyone is doing anything in a fork from master they'll run into problems when then do a git pull. I suspect no-one would be affected at the moment, so I don't strongly object, I just prefer a merge. I'll take a look at the conflicts on the PR and see if I can help.

Jon

On Wed, Sep 4, 2019 at 2:09 PM Tom Jenkinson <tom.jenkinson@xxxxxxxxxx> wrote:
BTW, another option I could do is cherry-pick commits from EE4J branch to master fixing as I go. The reason I preferred the route I mention is out of wondering if git will just see this as completely different forever in case something was added to EE4J later (not that I expect that) it might be easier to foreport it to master or vice versa. If there is a strong feeling we should do this that is OK too.

On Wed, 4 Sep 2019 at 14:00, Tom Jenkinson <tom.jenkinson@xxxxxxxxxx> wrote:
Does anyone have a problem with me forcing master to use the commits from our EE4J branch?


Just to be clear I am thinking of:

git checkout master
git reset --hard upstream/EE4J
// a kind of git revert of the artifact version number change we did in "https://github.com/eclipse-ee4j/jta-api/commit/d8fb67f9f26b73e836afd924da272239dd3a7620" but move it to 1.4 rather than 1.4-SNAPSHOT
Once agreed, either try to merge the PR using github or git push upstream master -f

Any objections?


Thanks,
Tom

_______________________________________________
jta-dev mailing list
jta-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://www.eclipse.org/mailman/listinfo/jta-dev


--
Jonathan Gallimore
http://twitter.com/jongallimore

Back to the top