git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
blob bba4bf999c88bc798916edaa66366770b994b5c6 1324 bytes (raw)
name: merge-strategies.h 	 # note: path name is non-authoritative(*)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
 
#ifndef MERGE_STRATEGIES_H
#define MERGE_STRATEGIES_H

#include "commit.h"
#include "object.h"

int merge_three_way(struct index_state *istate,
		    const struct object_id *orig_blob,
		    const struct object_id *our_blob,
		    const struct object_id *their_blob, const char *path,
		    unsigned int orig_mode, unsigned int our_mode, unsigned int their_mode);

typedef int (*merge_fn)(struct index_state *istate,
			const struct object_id *orig_blob,
			const struct object_id *our_blob,
			const struct object_id *their_blob, const char *path,
			unsigned int orig_mode, unsigned int our_mode, unsigned int their_mode,
			void *data);

int merge_one_file_func(struct index_state *istate,
			const struct object_id *orig_blob,
			const struct object_id *our_blob,
			const struct object_id *their_blob, const char *path,
			unsigned int orig_mode, unsigned int our_mode, unsigned int their_mode,
			void *data);

int merge_index_path(struct index_state *istate, int oneshot, int quiet,
		     const char *path, merge_fn fn, void *data);
int merge_all_index(struct index_state *istate, int oneshot, int quiet,
		    merge_fn fn, void *data);

int merge_strategies_resolve(struct repository *r,
			     struct commit_list *bases, const char *head_arg,
			     struct commit_list *remote);

#endif /* MERGE_STRATEGIES_H */

debug log:

solving bba4bf999c ...
found bba4bf999c in https://public-inbox.org/git/20210317204939.17890-10-alban.gruin@gmail.com/ ||
	https://public-inbox.org/git/20220809185429.20098-9-alban.gruin@gmail.com/
found 8705a550ca in https://public-inbox.org/git/20220809185429.20098-8-alban.gruin@gmail.com/ ||
	https://public-inbox.org/git/20210317204939.17890-9-alban.gruin@gmail.com/
found 88f476f170 in https://public-inbox.org/git/20210317204939.17890-5-alban.gruin@gmail.com/ ||
	https://public-inbox.org/git/20220809185429.20098-4-alban.gruin@gmail.com/

applying [1/3] https://public-inbox.org/git/20210317204939.17890-5-alban.gruin@gmail.com/
diff --git a/merge-strategies.h b/merge-strategies.h
new file mode 100644
index 0000000000..88f476f170

Checking patch merge-strategies.h...
Applied patch merge-strategies.h cleanly.

skipping https://public-inbox.org/git/20220809185429.20098-4-alban.gruin@gmail.com/ for 88f476f170
index at:
100644 88f476f17028015aece8632191c8f56a86365b04	merge-strategies.h

applying [2/3] https://public-inbox.org/git/20220809185429.20098-8-alban.gruin@gmail.com/
diff --git a/merge-strategies.h b/merge-strategies.h
index 88f476f170..8705a550ca 100644

Checking patch merge-strategies.h...
Applied patch merge-strategies.h cleanly.

skipping https://public-inbox.org/git/20210317204939.17890-9-alban.gruin@gmail.com/ for 8705a550ca
index at:
100644 8705a550cad3b4bd0635a54853da9d4d3d650a3d	merge-strategies.h

applying [3/3] https://public-inbox.org/git/20210317204939.17890-10-alban.gruin@gmail.com/
diff --git a/merge-strategies.h b/merge-strategies.h
index 8705a550ca..bba4bf999c 100644

Checking patch merge-strategies.h...
Applied patch merge-strategies.h cleanly.

skipping https://public-inbox.org/git/20220809185429.20098-9-alban.gruin@gmail.com/ for bba4bf999c
index at:
100644 bba4bf999c88bc798916edaa66366770b994b5c6	merge-strategies.h

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).