Skip to main content

Return to Question

added 261 characters in body
Source Link
sppc42
sppc42
  • 3.3k
  • 2
  • 37
  • 56

Following normal gitflow, I have a master branch from which I have forked a feature branch for development purposes. In the feature branch, I have done tons of changes (added new files) and now need to merge back to master. Please note that these changes in the feature branch has happened over several weeks containing hundreds of commits.

However, due to requirements, I am allowed to take a sub-set of files, which have been edited/added across multiple commits.

Question is - how do I raise a pull request from feature to master containing the above sub-set of files only and ignore any other files that may have been added/edited?

Please note that its not possible to do a GIT cherry pick of commits, because

  1. There are hundreds of commit in the feature branch
  2. Any of these commits can contain the files to be merged back alongwith files that don't have to be merged back.

Thanks

Following normal gitflow, I have a master branch from which I have forked a feature branch for development purposes. In the feature branch, I have done tons of changes (added new files) and now need to merge back to master. Please note that these changes in the feature branch has happened over several weeks containing hundreds of commits.

However, due to requirements, I am allowed to take a sub-set of files, which have been edited/added across multiple commits.

Question is - how do I raise a pull request from feature to master containing the above sub-set of files only and ignore any other files that may have been added/edited?

Thanks

Following normal gitflow, I have a master branch from which I have forked a feature branch for development purposes. In the feature branch, I have done tons of changes (added new files) and now need to merge back to master. Please note that these changes in the feature branch has happened over several weeks containing hundreds of commits.

However, due to requirements, I am allowed to take a sub-set of files, which have been edited/added across multiple commits.

Question is - how do I raise a pull request from feature to master containing the above sub-set of files only and ignore any other files that may have been added/edited?

Please note that its not possible to do a GIT cherry pick of commits, because

  1. There are hundreds of commit in the feature branch
  2. Any of these commits can contain the files to be merged back alongwith files that don't have to be merged back.

Thanks

added 3 characters in body; edited title
Source Link
Acorn
Acorn
  • 26.4k
  • 7
  • 50
  • 78

GIT Git: How to raise a selective Pull Request containing only subset of files (not commits)

Following normal gitflow, I have a master branch from which I have forked a feature branch for development purposes. In the feature branch, I have done tons of changes (added new files) and now need to merge back to master. Please note that these changes in the feature branch has happened over several weeks containing hundreds of commits.

However, due to requirements, I am allowed to take a sub-set of files, which have been edited/added across multiple commits.

Question is - how do I raise a Pull Requestpull request from feature to master conainingcontaining the above sub-set of files only and ignore any other files that may have been added/edited?

Thanks

GIT: How to raise a selective Pull Request containing only subset of files (not commits)

Following normal gitflow, I have a master branch from which I have forked a feature branch for development purposes. In the feature branch, I have done tons of changes (added new files) and now need to merge back to master. Please note that these changes in the feature branch has happened over several weeks containing hundreds of commits.

However, due to requirements, am allowed to take a sub-set of files, which have been edited/added across multiple commits.

Question is - how do I raise a Pull Request from feature to master conaining the above sub-set of files only and ignore any other files that may have been added/edited?

Thanks

Git: How to raise a selective Pull Request containing only subset of files (not commits)

Following normal gitflow, I have a master branch from which I have forked a feature branch for development purposes. In the feature branch, I have done tons of changes (added new files) and now need to merge back to master. Please note that these changes in the feature branch has happened over several weeks containing hundreds of commits.

However, due to requirements, I am allowed to take a sub-set of files, which have been edited/added across multiple commits.

Question is - how do I raise a pull request from feature to master containing the above sub-set of files only and ignore any other files that may have been added/edited?

Thanks

Source Link
sppc42
sppc42
  • 3.3k
  • 2
  • 37
  • 56

GIT: How to raise a selective Pull Request containing only subset of files (not commits)

Following normal gitflow, I have a master branch from which I have forked a feature branch for development purposes. In the feature branch, I have done tons of changes (added new files) and now need to merge back to master. Please note that these changes in the feature branch has happened over several weeks containing hundreds of commits.

However, due to requirements, am allowed to take a sub-set of files, which have been edited/added across multiple commits.

Question is - how do I raise a Pull Request from feature to master conaining the above sub-set of files only and ignore any other files that may have been added/edited?

Thanks