GitHub user OhadR opened a pull request:
https://github.com/apache/maven-scm/pull/19
changes related to TFS-provider
there are some changes (commits) that have already been accepted. There are
other, new fixes that I want to upload to the master-branch. So when I create
another PR for the new changes - I see the "old" commits again (and hence there
are 'conflicts'). I have no idea why it happens, who can take care?
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/OhadR/maven-scm master
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/maven-scm/pull/19.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #19
----
commit ee87b13e87f6b2bcae275c0911afefe330509c4c
Author: OhadR <ohadr.develo...@gmail.com>
Date: 2014-05-19T10:01:06Z
support TFS checkin-policies
commit f8cc479e589ef7e68ed5558324bd75b7c8844dfc
Author: OhadR <ohadr.develo...@gmail.com>
Date: 2014-05-19T15:27:17Z
https://jira.codehaus.org/browse/SCM-750: support TFS checkin-policies
https://jira.codehaus.org/browse/SCM-750: support TFS checkin-policies
commit b21b6468aa444018202088af64521cf581bc1989
Author: OhadR <ohadr.develo...@gmail.com>
Date: 2014-05-24T21:01:08Z
[SCM-750] support checkin policies
commit d82b96a31c884214b9629538e9b7ff55ce3925e5
Author: OhadR <ohadr.develo...@gmail.com>
Date: 2014-05-24T21:04:49Z
[scm-750] checkin policies
commit c174d0b5e07e49fcce0510e4c47e0677346b64fe
Author: OhadR <ohadr.develo...@gmail.com>
Date: 2014-05-24T21:41:07Z
[SCM-750] checkin policies
commit bbda4b39aa9abad48e7ccc2038594c0dd5131223
Author: OhadR <ohadr.develo...@gmail.com>
Date: 2014-05-24T21:45:53Z
[SCM_750]: extract const
commit e80f2d3d02fe77441ac1c46c67a4046203d014fd
Author: OhadR <ohadr.develo...@gmail.com>
Date: 2014-05-25T13:01:32Z
[SCM-752] : edit mode is required in TFS !
commit 125bdfc0fbfa9c431915837506fa3959b931f40f
Author: OhadR <ohadr.develo...@gmail.com>
Date: 2014-05-26T14:40:39Z
[SCM 753] support TFS checkin-policies
commit cb9931ea83877cde6b380f5f9f3c9dcd30f09b02
Author: OhadR <ohadr.develo...@gmail.com>
Date: 2014-06-23T14:18:45Z
[SCM-759] cannot create Branch with TFS-provider
commit 81b9d8455c1cd95f439d121f2f9c8362a710c94a
Author: OhadR <ohadr.develo...@gmail.com>
Date: 2014-07-23T13:32:14Z
SCM-759: fixing tests...
commit 6534fc22811fff3f7c96992df0109fb5cbfb8b64
Author: OhadR <ohadr.develo...@gmail.com>
Date: 2014-07-23T14:06:25Z
gitignore
commit 3774a862d826adee4f95f1c55e23ec955eefc549
Author: OhadR <ohadr.develo...@gmail.com>
Date: 2014-07-29T12:53:46Z
[SCM 753] TFS - better flow for checkin policies errors
commit e72110a2ce779bdda62dbe73e002a6ad732ca49b
Author: OhadR <ohadr.develo...@gmail.com>
Date: 2014-08-06T09:08:27Z
[SCM-770] TFS: cannot create branch (release:branch) when using
TFS-power-tools
SCM-770
[TFS] cannot create branch (release:branch) when using TFS-power-tools
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org
For additional commands, e-mail: dev-h...@maven.apache.org
