Понятия не имею, как Git и Visual Studio Code генерируют свою синхронизацию и фиксируют историю.
Вот что я делаю:
- Я клонирую ветку
master какого-либо публичного репозитория.
- В VS Code я добавляю несколько изменений в некоторые файлы, создаю новую ветвь и фиксирую свои изменения путем синхронизации.
Через несколько недель были сделаны коммиты в ветке master публичного репозитория.
Итак, я ...
git fetch главная ветвь публичного репозитория. git merge публичная master ветка в мою локальную master ветку. git rebase моя локальная master ветка на мою локальную функциональную ветвь.
При этом код Visual Studio отображает множество загружаемых файлов на панели «Синхронизация»:
Когда я нажимаю «Синхронизировать», история моей ветви функций раздувается со всеми коммитами от других (плюс мой, снова и снова):
Почему это происходит? Как сохранить чистую историю, отображая только мои изменения, даже после перехода в публичную ветку master?
Единственное решение, которое я знаю до сих пор, - это сделать локальную копию моей ветви функций, удалить мою локальную / удаленную ветку функций и заново создать мою ветку функций. Но это не может быть единственным решением этой проблемы, не так ли?
* *
тысяча сорок-девять
EDIT:
Вот журнал ссылок:
0d1c3018 HEAD@{0}: reset: moving to HEAD
0d1c3018 HEAD@{1}: reset: moving to HEAD
0d1c3018 HEAD@{2}: checkout: moving from printable-doc to master
6603ced6 HEAD@{3}: rebase finished: returning to refs/heads/printable-doc
6603ced6 HEAD@{4}: rebase: _all.md files removed, .gitigore amened to exclude _all.md files from being checked in.
5c5981d1 HEAD@{5}: rebase: CSS rules added for printing, script added to create chapter-wide documentation files from single files.
96792a0c HEAD@{6}: rebase: docs(config) document optimization.chunkIds (#2727)
d74520b3 HEAD@{7}: rebase: Revert "cacheGroups" (#2725)
5b45f87a HEAD@{8}: rebase: Update split-chunks-plugin.md
cf26894c HEAD@{9}: rebase: Update split-chunks-plugin.md
87933814 HEAD@{10}: rebase: docs(plugins): Add title to cacheGroups (#2227)
df10358b HEAD@{11}: rebase: docs(plugins) IgnorePlugin new syntax and options (#2721)
df53ddd3 HEAD@{12}: pull --tags -r origin printable-doc: checkout df53ddd3fc0e0658ff8fe26601e335d54084e843
36fd49c6 HEAD@{13}: reset: moving to HEAD
36fd49c6 HEAD@{14}: reset: moving to HEAD
36fd49c6 HEAD@{15}: pull --force: Merge made by the 'recursive' strategy.
59f28dbf HEAD@{16}: rebase -i (finish): returning to refs/heads/printable-doc
59f28dbf HEAD@{17}: rebase -i (pick): _all.md files removed, .gitigore amened to exclude _all.md files from being checked in.
2ff2238a HEAD@{18}: rebase -i (pick): CSS rules added for printing, script added to create chapter-wide documentation files from single files.
c0c24679 HEAD@{19}: rebase -i (pick): fix(misc) Fix yarn install on node v10+ (#2750)
33edd340 HEAD@{20}: rebase -i (pick): docs(devServer): add `writeToDisk` option (#2747)
289c7f96 HEAD@{21}: rebase -i (pick): docs(guides): Update installation npm script name (#2749)
a9478498 HEAD@{22}: rebase -i (pick): fix(config): Fixed a single word (#2748)
f4a9e0c6 HEAD@{23}: rebase -i (pick): Add documentation for `Rule.use` as a function (#2694)
9fcb8f25 HEAD@{24}: rebase -i (pick): document when optimization.minimizer is fn (#2743)
fa315806 HEAD@{25}: rebase -i (pick): docs(plugins): Typo uses -> used in internal-plugins.md (#2742)
b56fb3c1 HEAD@{26}: rebase -i (pick): d3 doesn't include a pkg.browser field anymore (#2739)
87cc015e HEAD@{27}: rebase -i (pick): docs(concepts): Update why-webpack.md (#2729)
13d0c33f HEAD@{28}: rebase -i (pick): Change requestRegExp to resourceRegExp IgnorePluginOptions in docs (#2730)
93b53d8f HEAD@{29}: rebase -i (pick): docs(guides): Update author-libraries.md (#2735)
f49704df HEAD@{30}: rebase -i (pick): Document that concatenation is enabled by default (#2505)
148c2a1c HEAD@{31}: rebase -i (pick): docs(config): Added information on settings stats colors (#2731)
e6e266b9 HEAD@{32}: rebase -i (pick): docs(config) document optimization.chunkIds (#2727)
9999b431 HEAD@{33}: rebase -i (pick): docs(devServer): Clarify devServer "open" option description (#1890)
bee9bd81 HEAD@{34}: rebase -i (pick): Revert "cacheGroups" (#2725)
cf19bb6d HEAD@{35}: rebase -i (pick): docs(guides) Refer to specific polyfill reference (#2726)
8fa9e909 HEAD@{36}: rebase -i (pick): docs: added more info for magic comments (#2707)
08901f4a HEAD@{37}: rebase -i (pick): docs(configuration): Add default for parallelism (#2481)
e7aad8cb HEAD@{38}: rebase -i (pick): Update split-chunks-plugin.md
c20d28a9 HEAD@{39}: rebase -i (pick): Update split-chunks-plugin.md
e63bb3db HEAD@{40}: rebase -i (pick): docs(guides): Update hot-module-replacement.md (#2418)
9cbb47d4 HEAD@{41}: rebase -i (pick): docs(plugins) splitChunks enforce doesnt make maxSize ignored anymore (#2687)
3b7972cf HEAD@{42}: rebase -i (pick): docs(guides): Small readme improvements, remove the word "simple" (#2671)
51f0d24c HEAD@{43}: rebase -i (pick): docs(API) Add error report introduction of loaders (#2231) (#2298)
dab61061 HEAD@{44}: rebase -i (pick): docs(concepts): Add a warning note for common errors when specifying rules (#2376)
dc1c5470 HEAD@{45}: rebase -i (pick): docs(plugins): Add example on how to tree shake locales from date-fns (#2524)
4381e398 HEAD@{46}: rebase -i (pick): docs(plugins): Add title to cacheGroups (#2227)
f85d79fa HEAD@{47}: rebase -i (pick): docs(guides): Fix naming consistence of runtime.js output (#2512)
4e21d67a HEAD@{48}: rebase -i (pick): docs(plugins): Specify all inputs to `cacheGroup.name` (#2719)
8671cf2a HEAD@{49}: rebase -i (pick): docs(plugins) IgnorePlugin new syntax and options (#2721)
2cf4fcaa HEAD@{50}: rebase -i (start): checkout 2cf4fcaa63db30b244ea1325a7f0746ef84656e4
df53ddd3 HEAD@{51}: pull origin: Merge made by the 'recursive' strategy.
c1e40bec HEAD@{52}: rebase finished: returning to refs/heads/printable-doc
c1e40bec HEAD@{53}: rebase: _all.md files removed, .gitigore amened to exclude _all.md files from being checked in.
49901a1d HEAD@{54}: rebase: CSS rules added for printing, script added to create chapter-wide documentation files from single files.
0d1c3018 HEAD@{55}: rebase: checkout master
496d4429 HEAD@{56}: checkout: moving from master to printable-doc
0d1c3018 HEAD@{57}: rebase finished: returning to refs/heads/master
0d1c3018 HEAD@{58}: rebase: checkout upstream/master
8518cbb5 HEAD@{59}: checkout: moving from printable-doc to master
496d4429 HEAD@{60}: pull --tags origin printable-doc: Merge made by the 'recursive' strategy.
2cf4fcaa HEAD@{61}: commit: _all.md files removed, .gitigore amened to exclude _all.md files from being checked in.
92426f5a HEAD@{62}: commit: CSS rules added for printing, script added to create chapter-wide documentation files from single files.
8518cbb5 HEAD@{63}: checkout: moving from master to printable-doc
8518cbb5 HEAD@{64}: checkout: moving from printable-doc to master
8cd26a9f HEAD@{65}: checkout: moving from master to printable-doc
8518cbb5 HEAD@{66}: checkout: moving from printable-doc to master
8cd26a9f HEAD@{67}: commit: CSS rules added for printing, script added to create chapter-wide documentation files from single files.
d5d3979c HEAD@{68}: commit: CSS rules added for printing, script added to create chapter-wide documentation files from single files.
8518cbb5 HEAD@{69}: checkout: moving from master to printable-doc
8518cbb5 HEAD@{70}: checkout: moving from printable-doc to master
79524b6d HEAD@{71}: commit (merge): MarkDownLint re-activated.
337b0581 HEAD@{72}: commit: CSS rules added for printing, script added to create chapter-wide documentation files from single files.
8518cbb5 HEAD@{73}: reset: moving to HEAD~4
1bde1966 HEAD@{74}: commit: MarkDown lint re-enabled, comments added to MarkDown concatenation script.
11304c48 HEAD@{75}: commit: Chapter help pages will now be automatically generated on build.
7011075e HEAD@{76}: checkout: moving from master to printable-doc
8518cbb5 HEAD@{77}: checkout: moving from printable-doc to master
7011075e HEAD@{78}: checkout: moving from master to printable-doc
8518cbb5 HEAD@{79}: checkout: moving from printable-doc to master
7011075e HEAD@{80}: commit: MarkDownLinter disabled to be able to check-in changes.
f446769f HEAD@{81}: commit: CSS rules added for printing, script added to create chapter-wide documentation files from single files.
8518cbb5 HEAD@{82}: checkout: moving from master to printable-doc
8518cbb5 HEAD@{83}: reset: moving to HEAD
8518cbb5 HEAD@{84}: clone: from https://github.com/SetTrend/webpack.js.org.git